Remove the scroll timeout. (#390872, Yevgen Muntyan)

2006-12-30  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktextview.c (gtk_text_view_destroy): Remove the
        scroll timeout.  (#390872, Yevgen Muntyan)

svn path=/trunk/; revision=16993

diff --git a/ChangeLog b/ChangeLog
index 2e35a45c88721e254cc3115222c6acc6176a1d4b..a7288daf5f40dc9cdeb7877870b483b2ef7097d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_destroy): Remove the
+       scroll timeout.  (#390872, Yevgen Muntyan)
+
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkprintoperation-unix.c:
+       * gtk/gtkprintbackend.c:
+       * gtk/gtkfilechooserdefault.c:
+       * gtk/gtksettings.c: Move a few settings to gtksettings.c
+       to make sure they show up in the docs.  (#365364, Christian
+       Persch)
+
 2006-12-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkassistant.c: Redraw assistant on reallocate

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index cf393ea0860d167a13745f4b2c629d0c8d3afb39..3bac02a5951016db4eeff8f3a48abe8d35421586 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2552,6 +2552,12 @@ gtk_text_view_destroy (GtkObject *object)
   gtk_text_view_set_buffer (text_view, NULL);
   gtk_text_view_destroy_layout (text_view);
 
+  if (text_view->scroll_timeout)
+    {
+      g_source_remove (text_view->scroll_timeout);
+      text_view->scroll_timeout = 0;
+    }
+
   (* GTK_OBJECT_CLASS (gtk_text_view_parent_class)->destroy) (object);
 }